From 8fce9eab79ba5e61927436bf78803c95b172fbb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Lindqvist?= Date: Sun, 23 Mar 2008 18:27:03 +0000 Subject: [PATCH] Guard against NULL pointer. (#467051, Gian Mario Tagliaretti) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-03-23 Björn Lindqvist * gdk-pixbuf/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Guard against NULL pointer. (#467051, Gian Mario Tagliaretti) svn path=/trunk/; revision=19929 --- ChangeLog | 5 +++++ gdk-pixbuf/gdk-pixbuf-io.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 705ce561ae..2ea261f258 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-23 Björn Lindqvist + + * gdk-pixbuf/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Guard + against NULL pointer. (#467051, Gian Mario Tagliaretti) + 2008-03-23 Cody Russell * gdk/win32/gdkevents-win32.c (show_window_recurse): diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 9214ce4cd6..5a6f598503 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -1497,6 +1497,8 @@ gdk_pixbuf_new_from_xpm_data (const char **data) GdkPixbufModule *xpm_module; gboolean locked; + g_return_val_if_fail (data != NULL, NULL); + xpm_module = _gdk_pixbuf_get_named_module ("xpm", &error); if (xpm_module == NULL) { g_warning ("Error loading XPM image loader: %s", error->message); -- 2.30.2